From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 20 Jul 2011 16:32:42 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2716^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6603de26db707f3ca3f03e651ca9e0e1a1f5db7c;p=emacs.git

Merge from trunk.
---

6603de26db707f3ca3f03e651ca9e0e1a1f5db7c